From ca01c742be35d7556ff072587d644d761a4a05e2 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 7 Apr 2009 14:37:35 +0100 Subject: [PATCH] tools: fix python installation attached patch lets python install the modules into DESTDIR/PREFIX as before, but lets python search the modules in PREFIX rather DESTDIR/PREFIX. This prevents failures about not finding python modules after files have been installed into PREFIX. Signed-off-by: Christoph Egger --- tools/pygrub/Makefile | 3 +-- tools/python/Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 48e982c075..0e30db481c 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -10,9 +10,8 @@ build: .PHONY: install ifndef XEN_PYTHON_NATIVE_INSTALL -install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()") install: all - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --install-lib="$(DESTDIR)$(LIBDIR)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot else install: all diff --git a/tools/python/Makefile b/tools/python/Makefile index 249bf634e7..700640645b 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -55,9 +55,8 @@ refresh-po: $(POTFILE) .PHONY: install ifndef XEN_PYTHON_NATIVE_INSTALL -install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()") install: install-messages install-dtd - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)$(PREFIX)" --prefix="" --force --install-lib="$(DESTDIR)$(LIBDIR)/python" + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force else install: install-messages install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force -- 2.30.2